summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add null check to formData.append645-profile-update-bugAnnabel Dunstone2016-04-181-2/+3
* Merge branch 'diff-js-error-fix' into 'master' Robert Speicher2016-04-181-3/+4
|\
| * Fixed issue with spinner not hiding on diff changesPhil Hughes2016-04-181-3/+4
* | Merge branch 'tag-grape-allowed' into 'master' Robert Speicher2016-04-182-2/+5
|\ \ | |/ |/|
| * Add "action" tag to /internal/allowed APIYorick Peterse2016-04-182-2/+5
|/
* Merge branch 'issue_3508' into 'master' Douwe Maan2016-04-189-20/+113
|\
| * Add changelog entryFelipe Artur2016-04-182-1/+2
| * Fix documentation and improve permissions codeFelipe Artur2016-04-186-13/+6
| * Insert instructions in admin page and permissions documentFelipe Artur2016-04-182-1/+10
| * Remove group members checkFelipe Artur2016-04-185-24/+14
| * Insert users check into apiFelipe Artur2016-04-185-7/+33
| * Code fixesFelipe Artur2016-04-185-28/+14
| * Fix specsFelipe Artur2016-04-182-3/+5
| * Fix codeFelipe Artur2016-04-185-12/+8
| * Add specs and fix codeFelipe Artur2016-04-186-18/+65
| * Move verification to abilitiesFelipe Artur2016-04-185-12/+47
| * Restrict user profiles based on restricted visibility levelsFelipe Artur2016-04-182-0/+8
* | Merge branch 'transaction-query-count' into 'master' Rémy Coutable2016-04-183-0/+5
|\ \ | |/ |/|
| * Count the number of SQL queries per transactionYorick Peterse2016-04-183-0/+5
* | Merge branch 'tasklist-fix' into 'master' Jacob Schatz2016-04-182-6/+0
|\ \
| * | Fixed issue with tasklist toggling sidebar refreshtasklist-fixPhil Hughes2016-04-182-6/+0
* | | Merge branch 'import-feedback' into 'master' Jacob Schatz2016-04-189-41/+122
|\ \ \
| * | | Addressed feedbackPhil Hughes2016-04-181-3/+3
| * | | Variable nameimport-feedbackPhil Hughes2016-04-141-2/+2
| * | | Updated based on feedbackPhil Hughes2016-04-148-25/+25
| * | | Moved loading icon to match todo loading iconPhil Hughes2016-04-127-16/+16
| * | | Added loading icon to import buttonsPhil Hughes2016-04-118-39/+120
* | | | Merge branch 'print-style' into 'master' Jacob Schatz2016-04-183-13/+34
|\ \ \ \
| * | | | CHANGELOG itemprint-stylePhil Hughes2016-04-181-0/+1
| * | | | Updated print stylePhil Hughes2016-04-182-13/+33
| | |/ / | |/| |
* | | | Merge branch 'discussion-notes' into 'master' Jacob Schatz2016-04-186-19/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed testsdiscussion-notesPhil Hughes2016-04-142-13/+13
| * | | Dicussion action mobile fixPhil Hughes2016-04-141-0/+11
| * | | Discussion notes updatePhil Hughes2016-04-147-31/+25
* | | | Merge branch 'feature/ci-job-env-variables' into 'master' Grzegorz Bizon2016-04-188-35/+168
|\ \ \ \
| * | | | Minor refactorings in CI configfeature/ci-job-env-variablesGrzegorz Bizon2016-04-182-7/+10
| * | | | Add minor fixes in docs for job-specific variablesGrzegorz Bizon2016-04-182-11/+7
| * | | | Validate job-level variables in YAML config fileGrzegorz Bizon2016-04-182-13/+40
| * | | | Update documentation on job level build variablesGrzegorz Bizon2016-04-181-4/+6
| * | | | Improve grammar in CI documentation for build varsGrzegorz Bizon2016-04-181-4/+7
| * | | | Add documentation for job-level build variablesGrzegorz Bizon2016-04-182-1/+24
| * | | | Minor refactoring in code related to job variablesGrzegorz Bizon2016-04-182-24/+25
| * | | | Remove code that removes duplicate CI variablesGrzegorz Bizon2016-04-182-15/+1
| * | | | Add Changelog entry for job-level variablesGrzegorz Bizon2016-04-181-0/+1
| * | | | Improve build specs for job environment variablesGrzegorz Bizon2016-04-181-2/+5
| * | | | Make CI config return empty array if no job variablesGrzegorz Bizon2016-04-182-2/+17
| * | | | Rename method that returns global envs in CI confGrzegorz Bizon2016-04-183-3/+3
| * | | | Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-185-25/+38
| * | | | Make it possible to override build variablesGrzegorz Bizon2016-04-183-7/+22
| * | | | Add `variables` keyword to job in CI config YAMLGrzegorz Bizon2016-04-184-15/+60