Subject | Hash | Author | Date (UTC) |
---|---|---|---|
Return error if a mr cannot be found | 3eea0ed2eb3b7a103dac191b7047268baa95d20f | Catalin(ux) M. BOIE | 2017-03-02 17:40:46 |
Do not show big files. | 2911893ff2790dabd0276a0fe83bfddcb0dd91c3 | Catalin(ux) M. BOIE | 2017-02-26 09:44:01 |
Disable fetch by git protocol of private repos! | 34542abdf3711dad4fef26b36e2c9f057aac4fff | Catalin(ux) M. BOIE | 2017-02-24 22:04:59 |
Set language to 'en' for htmln tag | be020d391beb150bab9fa3eedb0e4fcddf00ce00 | Catalin(ux) M. BOIE | 2017-02-24 22:03:47 |
Trademark signs for Git and add a reference to SFC | 223d90296b59a44b2887808301443264bde89a13 | Catalin(ux) M. BOIE | 2017-02-24 22:02:49 |
TODO changes | 0072cc306c6dfec9349a7d67dd1d71650dc0ef3a | Catalin(ux) M. BOIE | 2017-02-24 21:57:31 |
SELinux policy; php-fpm pids, logs and sockets | cf7770b2233a216c697e3f340f95960ccfe843cf | Catalin(ux) M. BOIE | 2017-02-24 21:57:12 |
Improved testing; add a fetch over git for a private repo | 8241de314aff22da494bbd0ed5b1ee2017674c6f | Catalin(ux) M. BOIE | 2017-02-24 21:52:02 |
Change caps for some error message; no code changes. | aab9ce336362beda61a4470cbd63ccc06778eeb1 | Catalin(ux) M. BOIE | 2017-02-24 21:48:13 |
Some clients, for exampple JGit sends the request gzipped. Deal with it. Thanks Gabi for the report! | ea9023af24a172724ec22313c8c0c15cc88f90df | Catalin(ux) M. BOIE | 2017-02-24 19:47:29 |
Switch to quotes to be able to use commas; small corrections | ab27969287d666d0fb526f7b24b04f65ab7d54f7 | Catalin(ux) M. BOIE | 2017-02-14 18:28:13 |
Added more info to comparison and added baloons (Stig suggestion) | 07c13312204980b85229acf7f0ab1e3a66aa6677 | Catalin(ux) M. BOIE | 2017-02-13 18:31:41 |
Comparison updated based on Stig's help! Thanks! | d45c87235c003153b0579d9d875b62a0f6e0f209 | Catalin(ux) M. BOIE | 2017-02-13 17:54:00 |
Corrected a ORDER before WHERE affecting the listing of the users in admin section | ee889bb3e9fb175af625cc5dab26c079fe6a6108 | Catalin(ux) M. BOIE | 2017-01-31 18:08:47 |
Bump version to v0.65 | 23209e409cae8a83b33b53b3cb3109a63be7bd8c | Catalin(ux) M. BOIE | 2017-01-30 18:52:26 |
Updates SELinux policy file | fa9d4acd0c6ee730ee45c3e3ab57b55665e74666 | Catalin(ux) M. BOIE | 2017-01-30 18:51:52 |
Added credits for TLS setup about perfect forward secrecy | 63ff4cf11961421d6f187d2597354d12eff9a810 | Catalin(ux) M. BOIE | 2017-01-30 18:51:31 |
Make more clear the text about Enterprise Edition | 20a621f3de637975d93cbb260213c2d833a0acab | Catalin(ux) M. BOIE | 2017-01-30 18:50:50 |
TODO updates | 29e7ddcea2ed6add27a13dfef09c8660d4b3520e | Catalin(ux) M. BOIE | 2017-01-30 18:49:28 |
Use IdentitiesOnly when setup SSH config for RocketGit | fbd5d71c0341f9187cfd677d2d620749d09c61d6 | Catalin(ux) M. BOIE | 2017-01-30 18:49:10 |
File | Lines added | Lines deleted |
---|---|---|
inc/mr.inc.php | 24 | 13 |
File inc/mr.inc.php changed (mode: 100644) (index 507fb2f..8564878) | |||
... | ... | function rg_mr_load_one($db, $repo_id, $id) | |
301 | 301 | rg_prof_start('mr_load_one'); | rg_prof_start('mr_load_one'); |
302 | 302 | rg_log('mr_load_one: repo_id=' . $repo_id . ' id=' . $id); | rg_log('mr_load_one: repo_id=' . $repo_id . ' id=' . $id); |
303 | 303 | ||
304 | $params = array('repo_id' => $repo_id, 'id' => $id); | ||
305 | $sql = 'SELECT * FROM merge_requests' | ||
306 | . ' WHERE repo_id = @@repo_id@@' | ||
307 | . ' AND id = @@id@@'; | ||
308 | $res = rg_sql_query_params($db, $sql, $params); | ||
309 | if ($res === FALSE) { | ||
310 | rg_mr_set_error('cannot load the merge request'); | ||
311 | return FALSE; | ||
312 | } | ||
304 | $ret = FALSE; | ||
305 | while (1) { | ||
306 | $params = array('repo_id' => $repo_id, 'id' => $id); | ||
307 | $sql = 'SELECT * FROM merge_requests' | ||
308 | . ' WHERE repo_id = @@repo_id@@' | ||
309 | . ' AND id = @@id@@'; | ||
310 | $res = rg_sql_query_params($db, $sql, $params); | ||
311 | if ($res === FALSE) { | ||
312 | rg_mr_set_error('cannot load the merge request'); | ||
313 | break; | ||
314 | } | ||
313 | 315 | ||
314 | $row = rg_sql_fetch_array($res); | ||
315 | rg_mr_cosmetic($db, $row); | ||
316 | $rows = rg_sql_num_rows($res); | ||
317 | if ($rows) | ||
318 | $ret = rg_sql_fetch_array($res); | ||
319 | rg_sql_free_result($res); | ||
316 | 320 | ||
317 | rg_sql_free_result($res); | ||
321 | if ($rows == 0) { | ||
322 | rg_mr_set_error('mr not found'); | ||
323 | break; | ||
324 | } | ||
325 | |||
326 | rg_mr_cosmetic($db, $ret); | ||
327 | break; | ||
328 | } | ||
318 | 329 | ||
319 | 330 | rg_prof_end('mr_load_one'); | rg_prof_end('mr_load_one'); |
320 | return $row; | ||
331 | return $ret; | ||
321 | 332 | } | } |
322 | 333 | ||
323 | 334 | /* | /* |