summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated MR comparenew-mr-improvementsPhil Hughes2016-04-136-26/+31
* Merge branch 'jira_docs' into 'master' Achilleas Pipinellis2016-04-132-5/+17
|\
| * Tie example config to JIRA screenshotAchilleas Pipinellis2016-04-132-5/+17
* | Merge branch 'issue_15044' into 'master' Rémy Coutable2016-04-134-6/+37
|\ \ | |/ |/|
| * Add changelog entry, improve specs and model codeissue_15044Felipe Artur2016-04-123-14/+9
| * Allow to close invalid merge requestFelipe Artur2016-04-113-5/+41
* | Merge branch 'docs-new-branch-button-3886' into 'master' Achilleas Pipinellis2016-04-132-0/+32
|\ \
| * | Move 'New branch from issue' feature doc to web_editor.mdAchilleas Pipinellis2016-04-133-9/+32
| * | Docs for the new branch buttondocs-new-branch-button-3886Zeger-Jan van de Weg2016-03-282-0/+9
* | | Merge branch 'fix-stale-branch-count-cache' into 'master' Yorick Peterse2016-04-133-0/+5
|\ \ \
| * | | Fix repository cache invalidation issue when project is recreated with an emp...Stan Hu2016-04-133-0/+5
* | | | Merge branch 'api-group-visibility' into 'master' Rémy Coutable2016-04-134-2/+152
|\ \ \ \ | |/ / / |/| | |
| * | | Fix minor issues according development guidelinesRobert Schilling2016-04-123-11/+17
| * | | API: Ability to update a groupRobert Schilling2016-04-124-2/+146
* | | | Merge branch 'notes-input' into 'master' Jacob Schatz2016-04-123-5/+36
|\ \ \ \
| * | | | Remove max-width from commentsnotes-inputAnnabel Dunstone2016-04-122-14/+0
| * | | | Input updatesAnnabel Dunstone2016-04-123-5/+49
| * | | | Wrap text in notes box if longer than code in diffAnnabel Dunstone2016-04-121-0/+1
* | | | | Merge branch 'fix-todo-target-path' into 'master' Robert Speicher2016-04-122-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix todo_target_path for todos where target was removedfix-todo-target-pathDouglas Barbosa Alexandre2016-04-122-0/+4
|/ / / /
* | | | Merge branch 'rs-update-spring' into 'master' Robert Speicher2016-04-122-6/+6
|\ \ \ \
| * | | | Update spring and spring-commands-spinachrs-update-springRobert Speicher2016-04-122-6/+6
* | | | | Merge branch 'issue_14206' into 'master' Jacob Schatz2016-04-126-7/+160
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into issue_14206issue_14206Alfredo Sumaran2016-04-11214-943/+2578
| |\ \ \ \ \
| * | | | | | Rename method and initialize .timeago insideAlfredo Sumaran2016-04-114-19/+10
| * | | | | | Update datetime in .timeago elementsAlfredo Sumaran2016-04-073-6/+28
| * | | | | | Add datetime_utility.js.coffeeAlfredo Sumaran2016-04-071-0/+15
| * | | | | | Add date.format.jsAlfredo Sumaran2016-04-071-0/+125
| * | | | | | Convert time param to TimeAlfredo Sumaran2016-04-071-1/+1
* | | | | | | Merge branch 'check-import-job-status' into 'master' Robert Speicher2016-04-121-2/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Check and report import job status to help diagnose issues with forkingStan Hu2016-04-111-2/+8
* | | | | | | Merge branch 'project-title-dropdown' into 'master' Jacob Schatz2016-04-1210-37/+82
|\ \ \ \ \ \ \
| * | | | | | | Updated CHANGELOGPhil Hughes2016-04-121-9/+1
| * | | | | | | Updated based on Ruby feedbackPhil Hughes2016-04-122-1/+9
| * | | | | | | Updated RubyPhil Hughes2016-04-122-3/+7
| * | | | | | | Updated based on Ruby feedbackPhil Hughes2016-04-123-19/+21
| * | | | | | | Tests updatePhil Hughes2016-04-122-22/+24
| * | | | | | | Updated testsPhil Hughes2016-04-123-4/+3
| * | | | | | | Project dropdown in header uses new dropdownPhil Hughes2016-04-126-13/+51
* | | | | | | | Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' Robert Speicher2016-04-122-2/+2498
|\ \ \ \ \ \ \ \
| * | | | | | | | fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocompleteArinde Eniola2016-04-092-2/+2498
* | | | | | | | | Merge branch 'member-access-note-row' into 'master' Jacob Schatz2016-04-121-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed issue with member access not being visible on notesmember-access-note-rowPhil Hughes2016-04-081-6/+6
* | | | | | | | | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-122-1/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add some changes to the testfix_quick_submit_missing_in_edit_merge_requestArinde Eniola2016-04-071-11/+5
| * | | | | | | | | | add testArinde Eniola2016-04-071-0/+27
| * | | | | | | | | | fix quick submit missing in edit merge request pageArinde Eniola2016-04-071-1/+1
* | | | | | | | | | | Merge branch 'admin-pages-layout-sass-update' into 'master' Jacob Schatz2016-04-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updated meqia query for admin/groups search boxadmin-pages-layout-sass-updatePhil Hughes2016-04-071-3/+3
* | | | | | | | | | | | Merge branch 'right-sidebar-link-hover' into 'master' Jacob Schatz2016-04-121-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |